Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[next] chore(master): merge master into next #5124

Merged
merged 73 commits into from
Jan 24, 2024
Merged

Conversation

raimund-schluessler
Copy link
Contributor

@raimund-schluessler raimund-schluessler commented Jan 23, 2024

☑️ Resolves

  • Merges master into next.

This was one hell of a backport 🙈 But I think I got everything working. And it also fixes the search box of NcEmojiPicker that currently does not work for next.

After this is merged, I want an alpha release of nextcloud/[email protected] 😉

susnux and others added 30 commits January 22, 2024 03:40
If the type is set to number and a number is passed as value also emit a number instead of a string.

Co-authored-by: Grigorii K. Shartsev <[email protected]>
Co-authored-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: Ferdinand Thiessen <[email protected]>
…pport-numeric-value

enh(NcInputField): Support numeric values - if numeric also emit numeric
Bumps [@nextcloud/webpack-vue-config](https://github.com/nextcloud/webpack-vue-config) from `fa79b40` to `84bc123`.
- [Release notes](https://github.com/nextcloud/webpack-vue-config/releases)
- [Commits](nextcloud-libraries/webpack-vue-config@fa79b40...84bc123)

---
updated-dependencies:
- dependency-name: "@nextcloud/webpack-vue-config"
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
…yarn/nextcloud/webpack-vue-config-84bc123
…progress

feat(NcProgressBar): add circular progress bar
Signed-off-by: Raimund Schlüßler <[email protected]>
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
100% translated source file: 'l10n/messages.pot'
on 'es'.
…9836fb49eeb7494eb2c87d1dac

Updates for project Nextcloud vue library
…accessible-opacity

Remove inaccessible opacity from SettingsSection
Antreesy and others added 10 commits January 23, 2024 18:50
…ithub-markdown

feat(`NcRichText`) add support of GFM (extended markdown)
Signed-off-by: Christopher Ng <[email protected]>
100% translated source file: 'l10n/messages.pot'
on 'cs_CZ'.
100% translated source file: 'l10n/messages.pot'
on 'tr'.
…9836fb49eeb7494eb2c87d1dac

Updates for project Nextcloud vue library
@raimund-schluessler raimund-schluessler added 3. to review Waiting for reviews vue 3 Related to the vue 3 migration labels Jan 23, 2024
@Antreesy
Copy link
Contributor

Ah, I had a prepared backport at my laptop for you 🙈

Comment on lines +589 to +590
// Vue 2.7 renders three non-breaking spaces here for some reason
expect(item).have.text(' ' + testCases[index].output)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Vue 2.7 renders three non-breaking spaces here for some reason
expect(item).have.text(' ' + testCases[index].output)
expect(item).have.text(testCases[index].output)

This test fails for me at least locally

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably, should be contains

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, the test seems to run fine on CI, no?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to run fine, as we see it. But I believe, Grigorii's proposal should fit here better

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also have this issue on master locally.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also have this issue on master locally.

Thanks for taking care of it on master

@susnux susnux merged commit 3d2d302 into next Jan 24, 2024
15 checks passed
@susnux susnux deleted the chore/noid/merge-master-next branch January 24, 2024 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews vue 3 Related to the vue 3 migration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants